Honor -Sn if comments were present.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@3632 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c
index c62e465e24890d6a1c30b43163e2eb706904f9ec..87eb851d2107174618c37ef783e230d6943d126d 100644 (file)
--- a/gpsbabel/garmin.c
+++ b/gpsbabel/garmin.c
@@ -848,7 +848,9 @@ waypoint_write(void)
                way[i]->ident[sizeof(way[i]->ident)-1] = 0;
 
                // If we were explictly given a comment from GPX, use that. 
-               if (wpt->description) {
+               //  This logic really is horrible and needs to be untangled.
+               if (wpt->description && 
+                   global_opts.smart_names && !wpt->gc_data->diff) {
                        memcpy(way[i]->cmnt, wpt->description, strlen(wpt->description));
                } else {
                        if (global_opts.smart_names &&